Remove random + 5 for width and height. If people want padding, they

Fri Nov  2 16:14:15 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkviewport.c (gtk_viewport_size_request): Remove
	random + 5 for width and height. If people want padding,
	they should add padding. (Note the +5 isn't padding
	that will always appear - it just appears in the case
	where the widget is allocated it's requisition.)
	(#51018, Janet Davis)

diff --git a/ChangeLog b/ChangeLog
index 97c78fff198edb1d58fb96408c0979b037991c27..848d5ff066cb336c68ebc4c632071ff7de90b9d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Nov  2 16:14:15 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkviewport.c (gtk_viewport_size_request): Remove
+       random + 5 for width and height. If people want padding,
+       they should add padding. (Note the +5 isn't padding
+       that will always appear - it just appears in the case
+       where the widget is allocated it's requisition.)
+       (#51018, Janet Davis)
+
 Fri Nov  2 15:53:23 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkimcontext.h (struct _GtkIMContextClass): Pad

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 97c78fff198edb1d58fb96408c0979b037991c27..848d5ff066cb336c68ebc4c632071ff7de90b9d6 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Fri Nov  2 16:14:15 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkviewport.c (gtk_viewport_size_request): Remove
+       random + 5 for width and height. If people want padding,
+       they should add padding. (Note the +5 isn't padding
+       that will always appear - it just appears in the case
+       where the widget is allocated it's requisition.)
+       (#51018, Janet Davis)
+
 Fri Nov  2 15:53:23 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkimcontext.h (struct _GtkIMContextClass): Pad

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 97c78fff198edb1d58fb96408c0979b037991c27..848d5ff066cb336c68ebc4c632071ff7de90b9d6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Fri Nov  2 16:14:15 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkviewport.c (gtk_viewport_size_request): Remove
+       random + 5 for width and height. If people want padding,
+       they should add padding. (Note the +5 isn't padding
+       that will always appear - it just appears in the case
+       where the widget is allocated it's requisition.)
+       (#51018, Janet Davis)
+
 Fri Nov  2 15:53:23 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkimcontext.h (struct _GtkIMContextClass): Pad

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 97c78fff198edb1d58fb96408c0979b037991c27..848d5ff066cb336c68ebc4c632071ff7de90b9d6 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Fri Nov  2 16:14:15 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkviewport.c (gtk_viewport_size_request): Remove
+       random + 5 for width and height. If people want padding,
+       they should add padding. (Note the +5 isn't padding
+       that will always appear - it just appears in the case
+       where the widget is allocated it's requisition.)
+       (#51018, Janet Davis)
+
 Fri Nov  2 15:53:23 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkimcontext.h (struct _GtkIMContextClass): Pad

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 97c78fff198edb1d58fb96408c0979b037991c27..848d5ff066cb336c68ebc4c632071ff7de90b9d6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Fri Nov  2 16:14:15 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkviewport.c (gtk_viewport_size_request): Remove
+       random + 5 for width and height. If people want padding,
+       they should add padding. (Note the +5 isn't padding
+       that will always appear - it just appears in the case
+       where the widget is allocated it's requisition.)
+       (#51018, Janet Davis)
+
 Fri Nov  2 15:53:23 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkimcontext.h (struct _GtkIMContextClass): Pad

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 97c78fff198edb1d58fb96408c0979b037991c27..848d5ff066cb336c68ebc4c632071ff7de90b9d6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Fri Nov  2 16:14:15 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkviewport.c (gtk_viewport_size_request): Remove
+       random + 5 for width and height. If people want padding,
+       they should add padding. (Note the +5 isn't padding
+       that will always appear - it just appears in the case
+       where the widget is allocated it's requisition.)
+       (#51018, Janet Davis)
+
 Fri Nov  2 15:53:23 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkimcontext.h (struct _GtkIMContextClass): Pad

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 97c78fff198edb1d58fb96408c0979b037991c27..848d5ff066cb336c68ebc4c632071ff7de90b9d6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Fri Nov  2 16:14:15 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkviewport.c (gtk_viewport_size_request): Remove
+       random + 5 for width and height. If people want padding,
+       they should add padding. (Note the +5 isn't padding
+       that will always appear - it just appears in the case
+       where the widget is allocated it's requisition.)
+       (#51018, Janet Davis)
+
 Fri Nov  2 15:53:23 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkimcontext.h (struct _GtkIMContextClass): Pad

diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index 9ac5b47d3054f12458593074c6b7401f04e95c1e..8446beee4ef535bd2c3a5091e8fe2c73ac14d9bf 100644 (file)
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -602,10 +602,10 @@ gtk_viewport_size_request (GtkWidget      *widget,
   bin = GTK_BIN (widget);
 
   requisition->width = (GTK_CONTAINER (widget)->border_width +
-                       GTK_WIDGET (widget)->style->xthickness) * 2 + 5;
+                       GTK_WIDGET (widget)->style->xthickness) * 2;
 
   requisition->height = (GTK_CONTAINER (widget)->border_width * 2 +
-                        GTK_WIDGET (widget)->style->ythickness) * 2 + 5;
+                        GTK_WIDGET (widget)->style->ythickness) * 2;
 
   if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     {